Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 2 Sep 2010 05:10:45 +0000 (05:10 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 2 Sep 2010 05:10:45 +0000 (05:10 +0000)
commit9668a77f8cfd90988b8c932d746ff2250649297e
treef091d081f6e528af3e7144da81160449f9d775ce
parentc85be1ee89396517366b1b8f9f6f5966d9eae147
parent6d8988a8b971bef3cfdce257352928e8b8b2b8d8
Merge from mainline.